Merge branch 'upstream'
authorAnton Gladky <gladk@debian.org>
Fri, 17 Sep 2021 20:13:55 +0000 (22:13 +0200)
committerAnton Gladky <gladk@debian.org>
Fri, 17 Sep 2021 20:13:55 +0000 (22:13 +0200)

Trivial merge